Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Sat, 25 Sep 2010 19:19:41 +0000 (15:19 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 25 Sep 2010 19:19:41 +0000 (15:19 -0400)
commite274a220302e78254ccff0b1571f201ae017689c
treea55226004be69b786583b29c8da53c41fecb6a21
parent08becddb02a39d968ada5b53765f58cd91da3e01
parent44796d29b6aa25325e20841551fbc254ca1503cf
Merge changes from emacs-23 branch.